From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 10 May 2010 07:13:43 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6605^2~187
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b5ca172cc8236269944aea3fb56a74859e866718;p=emacs.git

Merge from mainline.
---

b5ca172cc8236269944aea3fb56a74859e866718